clean up some merge problems
authorGert Wollny <gw.fossdev@gmail.com>
Sat, 4 Mar 2017 12:04:49 +0000 (12:04 +0000)
committerGert Wollny <gw.fossdev@gmail.com>
Sat, 4 Mar 2017 12:04:49 +0000 (12:04 +0000)
commit5eaa7c1d89fe9525604d3aa8474025b52a1f507b
tree86b649cc4abca32cb56bb3a80bef9289fbb81d5b
parentc07877df00ed8e47a92e5049f50227f51d2a164d
clean up some merge problems
dcmnet/libsrc/dstorscu.cc
dcmpmap/tests/Makefile.dep [deleted file]